uniformization
fix pr comments