Small refactor in DevsHandler