improved appearance and fixed some indentation