Cleaned up login a bit