Refactored/removed unnecessary