* Some refactoring