minor style changes in alignment with styleguide