minor extracting changes