Updated according reviews, refactored sign in methods