@chrisjluc - [#finished 62095072] Refactored code