A few WhiteSpace fixes and Comments removed.