Reorder method order for readability