refactor fixture processing