use cli
tidy
Merge pull request #3 from DaveBlooman/master

Use cli class