Removed redundant code and one redundant test. Now consistent with book at page 96.