Update to latest files and formatting