misc: code cleanup
Merge pull request #101 from saukko28/master

misc: code cleanup