refactoring and #126