Add first CLI option
More refactoring
re-fmt