Comments refactor