PR for code review

Removed unnecessary spaces na po.