All the changes looks PERFECT, except this comment looks outdated.