Another code cleanup