reafactored trading strategies