minor ocl.cpp refactoring