Make the re-initialize clearer