Refactoring of SIMD script & fix typo

(Closes #76)