I actually think I'll make a pull request later where I do this throughout the entire module.