Cleaning up, adding comments.