Refactoring.  #139