Move improvements to sample-exact controller handling,
also some coding style fixes
Merge pull request #744 from diizy/models

Move improvements to sample-exact controller handling,