some cleanup, docs too