Refactor heroes