minore refactor