I wasn't aware of that syntax and it's definitely a better solution, thank you for the suggestion. I've gone ahead and implemented the changes and added them to this PR.