Tidied Up DataSnapshot

Last update until I hear from you guys