cleaned up timestamp more