Code refactored...