Some more refactoring - removed dates and times from the sample; those are now the responsibility of the sensor objects.