Scattered Refactorings

I'm doing these while I learn the codebase.
This changes the function from a generator to return a list