Formatting and sorting fixes for WaveBox.Server