Beautify code with new language features.