small rewrites