I had it duplicated as the rest of the code for those two methods had been, but I can see that this is a bit more complicated and could be separated. I'll move that out and update the spacing to better match the existing standards.