Some minor structural updates