fix and cleanup controller