after the cleanup
Merge pull request #1 from alexanderpanchenko/master

some cleanup of the code