minor structure tweak