format fastq redo

@ElDeveloper and I tried to get #274 resolve merge conflicts and were unable to without somehow corrupting the branch. AFAIK, this new branch/PR contains everything in the existing PR.