Improved readability and removed unused variable. Removed unused initialized value.
Merge pull request #84 from mkarlsson/master

Improved readability and removed unused variable. Removed unused initialized value.