redindent and code correction