Code cleanup
Allow for custom defined external module names