some more preliminary refactor
bit more of refactor
address comments
run php-cs-fixer
Merge pull request #63 from cordoval/more-refactor

some more refactor of the other commands