refactoring
added calculator