More beautification on activation.