Cleaning up the code, preparing for release