Improving appearance and comments