Changed all method calls to be module methods
Changed all method calls to be module methods