Some final refactorings before OpenCL coding