removed unncessary short circuit assignment