improvements based on @rwaldron's review
improvements based on @rwaldron's review

LinusU/t2-cli,tessel/t2-cli,rwaldron/t2-cli,tessel/t2-cli,nodebotanist/t2-cli,LinusU/t2-cli,Student007/t2-cli,tikurahul/t2-cli,rwaldron/t2-cli,tikurahul/t2-cli,rwaldron/t2-cli,nodebotanist/t2-cli,tikurahul/t2-cli,tessel/t2-cli,nodebotanist/t2-cli