Non-functionality change just to make it more clear what is going on