Refactored build file