Cleaning up code, setting up for 2.0.1 release