More appropriate comment and location