Cleaned up and Updated the FileManager