1. Logout routine is implemented
2. Refactoring