Simple Cleanup

Simply caught up on some simple cleanup. No functional tests. Just PEP8 (within reason) found some unused variables, found some unused imports. Ran the supplied tests and everything comes back clean to putting this back out there to get pulled back into master.