Removed unnecessary checks.  Simplified edit.