refactor countdown (omg!)
cleanup