clean unused code,change calculator to calculation