Style changes, style fixes