cleaning up a little
plugged in other modules