pep8, fixes, refactoring, using custom user model