Fixed reorder warning.
Initialized variables; under some circumstances they would have no value otherwise.
Duplicate expressions in the if-statement removed.
Minor changes.
Replaced ctor-init with initializer list.
Merge pull request #50 from offa/minor_improvements

Minor (code-)improvements