Clean up verbose & duplicated timestamp creations
Marking starred