Refactor job class