Move else statements after right curly braces, move string literals to the left in string comparison, move trailing comments to a new/different line

BMS-80

Reviewer: Mae Turiana