DRY things up
cleanup those 'module' references