#673 - cleanup, improve docs