I have cleaned up some white-space errors too.