Removed unnecessary undefined check. Since we now have defaults, there is no need.