Some aesthetical changes