refactor MatchInfoActivty and MatchesActivity, organize code, fix javadoc