Refactored build.properties