Cleaned up login and startup