Don't export sort interfaces
Refactor: Reduce verbosity, improve efficiency