General code cleanup.
Merge pull request #5 from mdx-dev/feature/cleanup

General code cleanup.