formatting
clean-up in `get_psi`
refinement