clean up and comment