Move grid generation to separate function