refactor - final