Cleanup use of undefined and null