1.7.3 - r353 - Refactor a lot of the duplicated code into subs