refectoring Surface.