some minor corrections
Merge pull request #2 from mkawalec/master

Some corrections to function names and removed unneeded code