Fix typos and minor cleanup
Merge pull request #59 from alpe/minor_updates

Minor cleanup