cleaned up incoming controller