cleanup
working on #9 (effort 5h)