cleaning and fixed timestamp type