minor structure update