controller code cleanup

this shouldn't change the behaviour