Making the NE case a little more robust and clean.

Making the NE case a little more robust and clean. #45