Cleaning up for version 2.0.2