Minor code layout edits