Refactor into GridPoint class