Clean some cruft and whitespace
Use click for the CLI interface