doing some clean up and documentation