Removed unnecessary return statements