Updated module to be clean.