Refactor

PIU!