Applying style fixes