Misc Cleanup of white spaces that got left behind.