Fixed formatting, now under 80 columns