Refactor successful, also added comments for strategy to make scheduler testable (match)