Further cleanup and optimization to NEON vector operations