minor structure changes