Tidying up code
Merge branch 'master' of https://github.com/Det-Kongelige-Bibliotek/valhal