Improved cli options, refactored