Formatting, removal of the obsolete, refactoring.