minor clean up and documentation