Clean up
Support for more vectorizations
Function name repeated twice by mistake