Refactor
Improve Login