Refactor done