Cleaned syntax and added subcommands