Updating parser logic function name and comments