refactor: extract file path cleanup logic into a separate function

refactor: extract file path cleanup logic into a separate function #754