Contour class refactored