Spock and some cleanup