moved things around, cleaned up logging
cleanup
minor
cosmetic
remove rules
2to3