Fixing confusing named var
Playing around with defer - no real changes