minor incidental cleanup while looking at validation