better style, more shortcuts