fixed whitespacing issues