Removal of code duplication
Initial Quaternion implementation