Cleaned up the code for release.