Refactor

Piu-piu-piu!