Clean up small things
Refactor requirements and list-of-fields into one