Review: style cleanup