Follow up: style fixes