chore (*) refactor