Refactored build settings