small gdata refactoring