Refactor to use new s3 file check method
Refactor for readability