removed unnecessary return values