code cleanup

removed unnecessary wrapper
Merge pull request #366 from yogthos/patch-2

code cleanup