Made it more clear which part of the code is old code that I haven't deleted yet in case we want review old considerations.