Pull request with cleanup and improved navigation of Cycle Markup