second round of refactoring

8dd7b265 parent 1c550ff8 +5574 −1520
browse files