More cosmetic code edits