Alphabetize imports, and register fix command
Alphabetize imports, and make a simple if change into 1 line
Add fix command