small refactor, added winner annotations