[TASK] Cleaned Up controllers