Add comment and spacing