Refactor working well!