Fix identation for protected methods
Refactor CLI class