increase readability, also fix so that it still works the same for "undefined"