refactor - 003