All I did here was refactor by moving the conversion functions to the bottom of the class to match all the other conversion functions we use