Indentation changes and removal of unwanted lines