Class Calculator added
Spacing issues resolved and using calculator class instance for calculate