More beautification...