Style & comments modification