Added: Refactoring