clean up and now using module on itself