Removed unnecessary module wrapping