A few changes and whitespace fixed