Use proper indentation for switch statements, also add MAKE_ID macro and fix some comments