Refactoring and new maths types