Moved file target resolution into private method