Refactor GridLines