clean up and added new comments