Refactoring and ordering proposal