clean up, comment