Code style fixes in EngineMaster