Cleaning up code for v1.0 release