Clean & refactor (file_store manager without test)