Tidied up how paths are annototed to HTML output