Little code cleanup for housekeeping.