Refactored job parser and functions correctly