Add and clarify some style rules