refactored build tasks