Small refactoring
But DataSnaphshot were it belongs