Cleaned up login