Minor code & formatting cleanup