Fixed white space issues