Files Manager Improvements - cleaning code #94