More cleanups
Updating for release of version 0.5.2