Sort out the file headers, update copyright years, organized imports