Make modules more 'modular' and some cosmetic changes