More aesthetical changes