Code cleanup.
Merge pull request #4 from 4teamwork/mle-pkg-cleanup

Code cleanup.