Refactor to make future changes easier
Removed unnecessary references to `module` everywhere
Merge pull request #53 from wibblymat/refactor

Refactor to make future changes easier