Tuned early strategy and small refactor