Code beautify pass