A few aesthetical changes ...