Cleanup mode syntax and standardize