remove redundant var
short circuit else
remove redundant var
Merge branch 'tidy-orgs'