@stefanv I made the changes any way, since it adds to readability