cleaned up code 3 controllers