cleanup and method docs