clean up, code comments