underline links and minor refactor