Minor code layout