tiny refactor now that this genre nonsense works