Clean stylesheet, generalize more styles