refactored all the comments