Refactor FormatUtils and fix pluralized questions bug
Fix merge conflict