Import clean up and change of comment.