Small refactor and comments used for creating the documentation.