Refactor

isGoalTimeOver to -> isOverGoalTime