Refactor calculator; Modify code comments layout