Temporarily removing comments, getting flow a bit more polished for
writer