More cleaning (small change)