some code clean up to ocl module