Use less markup for links

This way to parse links is much easier and requires 2 times less markup.