#15 fixed build job parameters, refactored code