Code Refactor Final
Bug Fix