Updating documentation

Also removed an unnecessary short circuit. Verified unnecessary after
all tests passed after removing it.