Refactor!
Almost all of spill