Apply Marco's styling fixes