refactor jar class