NewBuild - Style changes and QA