simplified the datetime formatting for timestamps.
renamed the original Query class.