fix bug on recorded_at and received_at (sometime we can have null value)
clean code