Added jar, cleaned up some code