Minor rewrites