Refactored & Added description