moved Aptx creation from CalculationChooser to separate class