Cloud App Function refactoring...