Fix issue 26: Clean up modules initiliazation