litte refactor