Refactored

Fixed