Minor code layout fixes