BZ-9999 Beautify