Revisions to code style based on feedback from @jstaahl