Deck & Name list + Code cleaning