a bit more code polish on timeless code