Minor tweaks following review - extraction of methods, plus throwing upon unexpected data when mapping genres.