It would probably be good to change the comments too.