Refactor done: http