Fix global channel formatting, fix minor style gripes