little cleanup for CS