Cleanup, some doc added.