minor code readability tweaks
Merge branch 'dev' of github.com:itsbonczek/kingpin into dev