Refactor spoilers