(refactor) Add TODO comments, LoginService comments and organized dependency injections