Cleans up implementation of timestamp