cleanup of csurface
small changes