Refactor to guard clauses
Attempt to improve the --help output
Closes #914