Removed unnecessary references to `module` everywhere