small rewrites to improve readability