Working on beautification problem