Changed a few methods to be module functions instead of class methods