ok done here and several other places. I hope it does not make the code more difficult to read