clean up syntax, links