Adding return statement and comments