jamfile refactor