#109: minor stylistic changes