Simple refactorings.
Merge branch 'general-cleanthrough'

Conflicts:
	handlers/Handler.py