Simplify surface.cpp pt. 3