Minor code layout changes for aesthetics