Code re-indented