PR for code review

I've done this po.