clean unused code,change calculator to calculation
Merge pull request #12 from castomer/master

clean unused code,change calculator to calculation