Some clean up in the math + equals methods for vectors