Periodic update.  Refactoring