i thought we had a policy of not doing CS cleanup in code-changing commits...