start to remove organisations identifier
short cut
tidy up whitespace
set things up to short circuit
remove else-branch
hack around org condition insanity