cleaning up the code to prepare for release.