cleaned up code and generated jar