Refactoring and reordering.