Complete Makeover, mainly for Trade Strategy (accuracy and style fix)