controllers separated
calculator data refactored to service