fix indentation and style guide issues in new EngineStateController code