Refactor OK :D