Spike refactor