FixtureController code style fixes and typo fixes
Merge pull request #1774 from creocoder/fixture-controller-code-style-fixes

FixtureController code style fixes and typo fixes