style changes, from pr #361