cleanup, tests, godocs