Improved style (based on Sonar's feedback) and made Builder final.