Code cleaning #2