clean up/comments