Fix link and cleanup