style cleanups from review