Refactor one

Check it :D