Fix self:: reference
Module cleanup