Some controller code cleanup