kill crufty one off code
code cleanup, pep8ery, some comments