Code refactoring ....