Simple clean up

Remove unnecessary const and commented function call.
Merge pull request #95 from haaja/master

Remove unnecessary const