Move file-related methods that should be static out of BaseApp into FileUtils class
Clean up formatting