some minor cleanup
Merge pull request #1 from yoniLavi/master

some minor cleanup