Fixing Rotation Calculation

Both rotation conversions had errors - both had order of operations
errors, and one had an incorrect operator.