More cleanup, and pretty listings

template the `UA-HPC`