Syntax fixes, spaces, tabs, separated controller logic types.