Refactor face debugging in a minor way