Consolidate some style rules