Cleanup and simplify GridList Sample code