Formatting and sorting fixes for WaveBox.Core