Made login more OOP