Refactor CTA catalogue library code
Loading
This only fixes a relatively small number of SonarCloud issues and is not the full refactor. However, I want to complete a few other things first before I continue with the (proper) refactor. As such, I want to merge the few things in this branch so far to prevent it from becoming out-of-date in the future.
Progress towards #541, but does not complete it