Comment tweaks and do not set default local variable