Cleaning up the module class