Organized some stuff