Xaroth -Change: cleanup of codebase, pep8 fixes, typing additions.