SPAs ch3.6 tidy up