Cleanup, chatname changed to displayname for rooms, refactoring