Cleaned up Auth Controller