Clean up, add high resolution timer