Code cleanup, prepare project for the release