Add name for lightsaber, code cleanup