Started refactor of less job