some minor rewrites