Clean module and add reporting