Removed unnecessary return calls