Builder: Style cleanup
Minor linting / code revisions