Finish sse2 refactoring