[BUGFIX] SPring cleaning broke login
[CLEANUP] Cleaned Controller code