Removed Calculations class & changed some naming