Copyright file cleanup
Simplify common use of timer and some rework for rank