Refactor the surface format so that it is encapsulated in the surface type
Refactor the surface format so that it is encapsulated in the surface type

StrayLightning/aeolius,StrayLightning/aeolius,StrayLightning/aeolius