Removing scrap, correcting indentation