Improved beautification.
First work on settings.