GridList code cleanup and refactor