saving surface definitions as list of dicts.
small cleanup