Initial code drop from Dominall
PEP8 and code cleanup