Minor cleanup in the Controllers