lots more csslint refactoring