Made CLI options more user friendly