cleaned up short circuit conditional