Fixes White Space Issues