refactor - 002