cleaned up callback and creation of grid