minor bugfix + cleanup
Merge pull request #3 from wick-ed/master

minor bugfix + cleanup