fixing token replacment in code .comment blocks and formatting