Refactoring done

this.grid is never used anywhere, so grid should be enough