Refactor, move answerToBlockMap from BlockService to ModelHelper.