Improve settings, style, code