Some refactoring notes for Grid have been added