Major: Login Fixed, Minor: Small Code Cleanup