September cleanup

Just some python cleanup.