ArticleResponseMaker - refactor

- Re-worked how the response is put together to improve testability and
readability