Switch branch scheme
Remove unneeded line
Don't return from a scope