refactor some rows