Replace unnecessary branch
Fix docstring
Replace login with username