Style cleanup 2