organization and commenting