#452 Make utility classes adhere to styleguide