GM/RR code style cleanup