changed to a dictionary

changed to a dictionary holding the module reference and name
small fixes in indentation
housekeeping stuff
removed old reference