BET-31 Adding logout + litle refactoring