Style cleanup based on Matei feedback