Removed unnecessary return statments