Refactoring / #8