Cleaned up lines and syntax.
Minor abstraction.
PIP8 conventions added.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main.py