Moved some general code to the module.