Refacoring PR first round