trading.app.common refactored.