Cleaned up countdown
merged