Small refactoring: add comments, change output sentences and add better validation