generalize link names
more cleanup
modular = happy