Another code cleanup. Please ignore.