Adds comments
Comments and refactoring