Clean-up: 1) unused variables 2) typos
Merge pull request #145 from maxnajim/master

Clean-up