A few cleanups and added Dong's python