Rewrite: minor, non-functional changes to code style