cleared names a bit