Minor code enhancement