De-commenting FIGV code