Fix whitespacing issues