+ Some refactoring