refactory calculatorReposiotry