GPU code cleanup
Code updates