#673 - cleanup, documentation