Apply style fixes from reviews