Refactorize a little. re #127