made some simplifications taking into account other optimizations from clean-css