Mator Smash minor edits

just removing an unused type and refactoring some function names for
consistency