Fixed: Refactored; removed stray codes