more demo beautification