cleaning up code base for public release