Refactor Tips class