gril:fix queue removing in cancel group + style fixes

Signed-off-by: Jarko Poutiainen <Jarko.Poutiainen@oss.tieto.com>
Merge pull request #82 from jpoutiai/master

gril:fix queue removing in cancel group + style fixes