Some refactoring !!!