Clean-up some RIS comments; Reorder functions; Simplify conversion of XML to HTML mark-up