Style cleanup mostly