Beautification.

Work in progress.