Add comment for a better structure