Renamed contour variables
Updated TODO