polish
working on #17