A few slight improvements

Eike Flathrequested to merge
eike into main

Simplified a few things and also removed a print statement that I assumed shouldn't be there

Merge request reports