Further refactoring and resorting