Fixes lint warnings
Removes unused constructor
Merge pull request #264 from nsendetzky/master

Minor improvements