Some code cleanup
Merge pull request #242 from nwinklareth/master

Some code cleanup