just a refactor