Fixing White Space Issues