Adding a cleaner login method version