Added some accessibility, added code to logout method