* Minor code cleanup of last night's changes