fix exercise 4 and 5, create calc class