Some minor cleanup of the controller code hierarchy to make Level Controller a bit cleaner