Refactoring, mainly on cli help