Clean up
Split out Password into Password.py