Cleanup. Some comments.