Renaming Handlers to Commands, light cleanup