minor refactored of SIMD support (tested)