restructure controller init, to minimize property lookups
Merge pull request #3283 from stefanpenner/optimize_controller_init

Optimize controller init