minor rewrites