Web Calculator 2

Web Calculator 2 and Refactoring