Refactored
Removed old codes