More refactoring
Finished rpn_calculator