update to make variables inside of utility classes
Moving a few utility classes into mixins to be easier extended.