Move timing to constants & instance properties