Style changes from Marco