minor style improvements
build