More minor style amends to make CSS more OO