#4 little cleanup