Cleanup
Slightly more flexible link invocation