Remove duplicate and simplify some CSS properties