Reviewing the code and comments