Remove some duplicated code.  Reorganize some code.