Web Calculator 1 Refactoring