MOBILE-427 Syntax fixes
MOBILE-427 Refactor handleFiles