Style changes as per Matei's comments