Fix file name and formatting