deck, kerchief refactorings