upgrade countdown. Code cleanup