Extracted saving file to a separate file
Removed a file