Normalized code, corrected ident.