Smarter handling of sample timings
Cosmetics