Clean up and linkify