cleaned up figure task