Formatting updates.
Adds undef to unpolluted namespace (Thanks to @chachi for the comment)