minor structural updates