tidy up #23 to conform to code style