clean up and add comment