Can you add a TODO here indicating this list needs simplification and add a link to the github issue?