Removed Unnecessary Code / Refactor