Removed duplicated code of Timer