Command line options enabled
refactoring