Remove ifs from GRKs generation function (clean up a bit)