Applied some nice(?) style rules