Removed some unnecessary nil-comparisons. Also some minor style improvements.
Merge pull request #1 from sjakobi/master

Removed some unnecessary nil-comparisons. Also some minor style improvem...