Refactored
Fixed