Some aesthetical changes.