About to refactor maths
Refactored notation.