Cleaner commandline usage