cleanup monitor
more cleanup & formatting
don't repeat some code in HS Analyser
fix some bugs I introduced
fix MatchPopup creation (decks label changed)