Remove loop by checking against String name