Remark fix and formatting minor changes