a little more cleanup of controllers