Add a description and more comments