Cleaned up the module