Fix some whitespacing issues