CSS cleanup and fixed

Mehran! If you now are running benchmark on the CSS function, you will
see we are 40 - 60 % faster then others