Another code cleanup action