Added a vectorization compiler switch to the CPU back-end and cleaned-up the code further