Some refactoring
...