Style cleanup