Refactored
Fixed Bugs