orgnaizing some stuff