Started to clean up OpenCL code