Code Cleanup
Base for Login Service