fairly minor rewrites