Code beautify (68%)