set no organization if organization is null
up version
some rubocop