Adjusted whitespacing issues