controller cleaned up