Update outcome content and small refactor