cosmetics changes
revert to efficient version, without OCL kernel qualifiers