Refactoring. Removed top ordering field.