cleanup, closing #21 closing #18