More refactoring, reduce duplication

This commit is contained in:
Michael Suzuki
2016-06-22 21:52:31 +01:00
parent 53b4e30644
commit c20cb6924d