Jar - Cleaning up and making nice