Added fill for timeStamp() method
Cleanup