I think I have addressed all of your comments except I didn’t understand the comment about the spaces. Are there two spaces extra or do you want me to introduce two spaces somewhere?

I have attached the updated patch.

Regards,
Bjarte