Style changes to as per @hhatto's request