gpu: tidying things up