Style cleanup first round