cleanup
improved doc