Cosmetic changes.
Issue #15 fixed