refactor, remove boilerplate comments and add feature description