Cleaned up. Added jar