Move maths to fewer lines
Housekeeping