[comments] - Starting with the refactor