minor refactorings to deck