Small refactoring#1

Open

JH2535 wants to merge 1 commit intostandupmaths:mainfrom

Commits on Mar 3, 2022

Refactored code, pulling out some methods to make slightly more readable / reduce file size.
JH2535
committed