Try to refactor