neaten things up and fix a typo