minor cleanups and fixups!
minor fixup with the package name
do not need an initialized package for wrapper package
Merge pull request #3 from mahmoudimus/refactor

Refactor