Build process updates, style tweaks
Style changes, build process improvements