Remove an unnecessary row and refactor