Cleaning up working version