timestamp
Refactor code