Easy refactor and comments unused rows.