Minor changes.
Merge pull request #149 from bukzor/minor_cleanup

Minor changes.