cleanup
another pass at fixing #9