Some general cleanup.
Merge pull request #25 from chrissalij/cleanup

Some general cleanup.