Minor refactoring of CUDA non-bonded kernels