[minor] [file_manager] fixes to code and cleanup