ololo
Refactor