White Space Fixes