Refactor surfspots

[#19184367642579]