Cleanup module initialization
Merge pull request #6 from pbrady/fix_warning

Cleanup module initialization