Improve timing helper functions
Reorganize helpers