Rename SAI2EAIFlag to EAI2SAIFlag and some minor codestyle/trailing whitespaces clean-up.