Re-format; add canonical URL