Cleaned up markup and cross refs