clean up and method documentation