some more optimizations
Merge pull request #51 from bayendor/cleanup

some more optimizations