Refactord around the file